*** empty log message ***

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 2a193f5a4c54393b5a6bada8d7c8f56966f4faa3..fa263d527e77c4b24fed80cbfeeed42d0a1dc6c0 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -65,7 +65,6 @@
        * progmodes/cc-langs.el (c-before-font-lock-function): Fix bug in
        doc-string, "c-old-LEN" -> "c-old-END".
 
->>>>>>> 1.11049.2.667
 2008-02-29  Glenn Morris  <rgm@gnu.org>
 
        * allout.el (allout-topic-encryption-bullet)